merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 1 Sep 2010 00:55:43 +0000 (09:55 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 1 Sep 2010 00:55:43 +0000 (09:55 +0900)

Trivial merge